PHP

CSS

The Result

After trying several solutions, the following appears to have solved it for my setup, once and for all – add this to your .htaccess file:

In short, it massively bumps up the allowed memory limit, and also tries to turn off some security aspects for the file that deals with the uploading, under different module setups.

If your theme was written a while ago, your site might not be following all of the current best practices. Here are a few simple alterations you can make to your style.css file.

Theme URI

An easy one to start – in the header info, you’ll likely find a line starting with Theme URL (note the last character). This should now strictly be Theme URI.

License

In your theme, you might see some inconsistent or no license information at all. There are now a couple of specific slugs you can use, License and License URI, to show the same information in a way that WordPress can read from (example):

Tags

Tags haven’t been added to many themes at the moment, yet if you’ve got a lot of themes installed, being able to filter them to just certain features (see Appearance -> Themes -> Feature Filter, right-hand side, next to the Search button) could be useful. Many of the tags could be added by the functionality that a parent theme like Genesis provides, while some would be child theme specific. A theme that could theoretically meet every single tag would include the following:

Trailing Slash

Another easy one – if the Theme URI or Author URI values are the home page of a website, add a trailing slash to it – this typically saves an extra lookup on a server if someone clicks on the link.

Theme Name

Some themes might be named as “… Theme” or “… Child Theme”. The Theme Review guidelines recommend that the term “Theme” is not included (as everyone knows it’s a theme). Since the guidelines also suggest that the fact a theme is a child theme be mentioned in the Description, your theme could drop both terms. Switch to another theme before changing your theme name.

Template Version

Previously there was a suggestion to include a Template Version slug to child themes to indicate what version of the parent theme the child theme was built against. However, this appears to have been removed until such time that WordPress can actually use this information to notify users.

Further Information

Beyond the changes listed above, you can find more information via the theme review guidelines, by following the Theme Review Team discussions, and also by running the Theme Check plugin (the development version has a few extra fixes) on your theme. WordPress also has a set of CSS Coding Standards for the main portion of yout style sheet.

If you’re using the Genesis-created menus from the Theme Settings page, you don’t have as much control or flexibility as using custom menus. You may not want to switch to custom menus, just to remove the title attributes, say, so we need a different solution.

What Are Title Attributes?

Demonstration of a title tooltip

The title attribute is most often seen appearing as tooltips when you hover over one of the menu items. With custom menus, you can edit the title attribute to what you want, or even remove it altogether, but with the Genesis-created menus, it’s automatically populated, and there’s no interface for removing them.

However, we can remove them with some code.

Open up the functions.php file in your child theme and add the following code. The code should be entered at the end of the file, just before the closing ?> if there is one.

That looks through all of the navigation list items (Pages or Categories) for title="…" and removes them, before returning the list items markup to the function that creates Genesis menus.

Being Selective

What would you do if you just want to remove the title attributes on either the primary or secondary navigation, rather than both? Some slight changes are needed:

That would remove all the attributes for Pages or Categories menu in the Primary Menu slot. You can make it specific to just the Secondary Menu slot by amending all occurrences of primary to be secondary.

Open up the functions.php file in your child theme and add the following code. The code should be entered at the end of the file, just before the closing ?> if there is one.

The first function enqueues a reference to a style sheet file called style-ie7.css in our child theme folder. Using the wp_enqueue_style() is the correct way of adding style sheet references, as amongst other reasons, it provides a handle that we end up using in the second function. We hook the function in with a priority of 200. This make sure it appears after any other style sheets that you or a plugin have added in.

The second function surrounds what will be the <link> markup with a conditional comment to target only browsers that are less than or equal to (the lte bit) IE7. Other conditional comments are available, but this is by far the most common approach, with IE6- and IE7-specific styles thrown into the same file, to avoid an extra HTTP request. Browsers which aren’t IE just see the output as one big comment and promptly ignore it.

Credit to Michael Fields for highlighting the script_loader_tag filter methodology to me.

Open up the functions.php file in your child theme and add the following code. The code should be entered at the end of the file, just before the closing ?> if there is one.

add_action( 'wp_print_scripts', 'child_add_tweet_button' );
/**
 * Add tweet link and script.
 *
 * @author Gary Jones
 * @link http://code.garyjones.co.uk/add-tweet-button/
 */
function child_add_tweet_button() {

	// Only add this to anything not a page
	if ( ! is_page() ) {

		// Add a script to the bottom of the source
		wp_enqueue_script( 'tweet-button', 'http://platform.twitter.com/widgets.js', array(), '', true );

		// Filter in the required Twitter link for limited and unlimited content
		add_filter( 'the_content', 'child_add_tweet_button_link' );
		add_filter( 'the_content_limit', 'child_add_tweet_button_link' );

		// Remove stripped link from excerpts.
		add_filter( 'wp_trim_excerpt', 'child_remove_stripped_tweet_button' );

		// Optionally add it in to excerpts properly (uncomment to use).
		//add_filter( 'the_excerpt', 'child_add_tweet_button_link' );
	}
}

/**
 * Add tweet link.
 *
 * @author Gary Jones
 * @link http://code.garyjones.co.uk/add-tweet-button/
 *
 * @param string $content HTML markup for post content
 * @return string HTML markup for post content
 */
function child_add_tweet_button_link( $content ) {
	global $post;

	$query_string_parameters = array(

		// URL of the page to share
		'url' => get_permalink(),

		// Screen name of the user to attribute the Tweet to
		'via' => 'GaryJ',

		// Default Tweet text - here, the post title
		'text' => get_the_title( $post->ID ),

		// Related accounts that will be suggested to follow once tweet has been shared
		'related' => '',

		// Count box position - 'horizontal', 'vertical' or 'none'
		'count' => 'vertical',

		// The language for the Tweet Button - default is English (en)
		'lang' => 'en',

		// The URL to which your shared URL resolves to
		'counturl' => get_permalink()
	);

	// Optionally use this if you have custom shortlinks set up. Uncomment to use.
	//$query_string_parameters['url'] = wp_get_shortlink();

	// Construct our URL to pass to Twitter - gets urlencoded here
	$twitter_url = add_query_arg( $query_string_parameters, '//twitter.com/share' );

	return '<a href="' . htmlspecialchars( $twitter_url ) . '" class="twitter-share-button">Tweet</a>' . $content;
}

/**
 * Excerpt strip HTML, so the Tweet link just ends up as "Tweet" prefixed to the first word of the excerpt.
 *
 * Does mean that you can't start any article with the word Tweet, but this is an edge scenario.
 *
 * @author Gary Jones
 * @link http://code.garyjones.co.uk/add-tweet-button/
 *
 * @param string $content Plain text
 * @return string
 */
function child_remove_stripped_tweet_button( $content ) {
	return preg_replace( '/^Tweet/', '', $content, 1 );
}

While being substantially more code, this has several advantages:

• If JavaScript isn’t enabled, the markup is still valid for the default Genesis doctype; data-* attributes are only valid in HTML5, and while most users will have this switched out of the DOM in favour of the added iframe, the markup added by the first method is invalid for XHTML 1.0 Strict.
• The JavaScript from Twitter is only added once, at the bottom of the page, and not every time the button appears, such as on archive pages.
• The “text” argument is explicitely given as the title of the post in which the button appears (and not the title of the page where the post appears), meaning you can add buttons to posts on archive pages, or featured posts widget posts, and have the correct text be used.
• You can easily and optionally enable the button for excerpts as well as limited and unlimited post content.
• You can easily and optionally have your post shortlink as the URL to share, instead of the full permalink. Good if you’re tracking traffic through the shortlink.
• There are no redundant “Tweet” strings added at the beginning of excerpts, where the markup has been stripped.
• There is support for the “related” and “lang” arguments, allowing easier customization.

This tutorial will go through the steps to adding a variable column balanced grid for any archive page on your site. If you just want the code, skip to the final section. All of the code snippets go at the end of your child theme functions.php file, just before any closing ?> there might be, except for the CSS which will go at the end of your child theme style.css (or css/custom.css for Prose) file.

This tutorial requires Genesis 1.5 or later to work. Adding it to a child theme while running an earlier version of Genesis will kill your site, so go ahead and update Genesis first!

Using A Grid Loop

The first thing we need to decide, is on which pages we want the grid loop to run. The simple example tells you to put the loop helper function straight into home.php, which means it won’t run on category, tag, monthly, or other archive pages.

add_action( 'genesis_before_loop', 'child_maybe_do_grid_loop' );
/**
 * Before we get to the loop, see if we're anywhere but a single page. If so,
 * swap out the standard loop for our grid loop.
 *
 * @author Gary Jones
 * @link http://dev.studiopress.com/genesis-grid-loop-advanced.htm
 */
function child_maybe_do_grid_loop() {

	// Amend this conditional to pick where this grid looping occurs
	if ( ! is_single() && ! is_page() ) {

		// Remove the standard loop
		remove_action( 'genesis_loop', 'genesis_do_loop' );

		// Use the prepared grid loop
		add_action( 'genesis_loop', 'child_do_grid_loop' );

		// Add some extra post classes to the grid loop so we can style the columns
		add_filter( 'genesis_grid_loop_post_class', 'child_grid_loop_post_class' );
	}
}

This function uses the conditional tag of is_single(), preceded by the negation operator (!) to ensure the grid loop is not used on single posts, custom post types or attachments, and is_page() preceded by the negation operator to ensure it is not used on Pages either. That leaves it free to be used everywhere else.

The next three lines of code are quite logical – we remove our normal loop and add in our grid loop, which we’ll define in a moment. We also make reference to a filter that will add a few CSS classes which we use to style the columns.

Preparing The Grid Loop

Now we need to set up our grid loop. The genesis_grid_loop() functions takes an array of values, which we can configure.

/**
 * Prepare the grid loop.
 *
 * Takes care of existing query arguments for the page e.g. if it's a category
 * archive page, then the "cat" argument is carried into the grid loop, unless
 * it's overwritten in the $grid_args.
 *
 * @author Gary Jones
 * @link http://dev.studiopress.com/genesis-grid-loop-advanced.htm
 * @uses genesis_grid_loop() Requires Genesis 1.5
 */
function child_do_grid_loop() {

	global $query_string, $paged;

	// Ensure the arguments for the normal query for the page are carried forwards
	parse_str( $query_string, $query_args );

	// Create an array of arguments for the loop - can be grid-specific, or
	// normal query_posts() arguments to alter the loop
	$grid_args = array(
		'features' => 1,
		'feature_image_size' => 0,
		'feature_image_class' => 'alignleft post-image',
		'feature_content_limit' => 0,
		'grid_image_size' => 'grid-thumbnail',
		'grid_image_class' => 'alignleft post-image',
		'grid_content_limit' => 0,
		'more' => __( 'Continue reading →', 'genesis' ),
		'posts_per_page' => 6
	);

	// Make sure the first page has a balanced grid
	if ( 0 == $paged )
		// If first page, add number of features to grid posts, so balance is maintained
		$grid_args['posts_per_page'] += $grid_args['features'];
	else
		// Keep the offset maintained from our page 1 adjustment
		$grid_args['offset'] = ( $paged - 1 ) * $grid_args['posts_per_page'] + $grid_args['features'];

	// Merge the standard query for this page, and our preferred loop arguments
	genesis_grid_loop( array_merge( $query_args, $grid_args ) );

}

There’s a lot there, so lets go through it. Firstly, we pull in a couple of global values that WordPress has created and populated for us. We need these later in the function, so we need to be able to access the values of them.

Next we take the normal query arguments for that page (like the category ID, tag ID, custom post type name or something else that defines what set of posts we want) and put them into an array. The simple example didn’t need to include this, as the home page was just showing all posts, in the default date order. Now we’ve enabled the grid loop on other archive pages, this is needed.

Then comes the main configurable section for how we want the grid loop to run. See the Understanding the Parameters section on the simple example to know what they all mean. The only changes made here, are the number of features, number of posts_per_page, and the more link text.

The bit after that about balancing needs a little bit of explaining. In the simple example, the number of features was equal to the number of columns, meaning that on page 2 and later of the archives, the grid was always complete (except maybe for the final page). However, we want something more flexible that allows, say, 3 columns, and 1 feature post. If we set our posts_per_page to be an exact multiple of the number of columns, then on page 2 and later, the grid is balanced, but page 1, where one of the posts is a feature, means we’ll have an unsightly gap at the end of the grid. If we increased the posts_per_page so the page 1 looked right, then there would be one extra grid post on it’s own on all later pages!

What we do, therefore, is adjust the total number of posts to also include the number of feature posts we want, just for page 1 (props to Jen for identifying this issue and coming up with a simple fix). Unfortunately, this causes an overlap where the last post(s) (equal to the number of feature posts) on page 1 are repeated at the start of page 2, so we add an offset in, and WordPress starts pulling posts from the database at the right spot. Phew!

Finally, we take the first array of query values, merge it with our provided grid loop values, and send it all off to Genesis to create the grid loop itself. One alternative you might want here is to only show the features and grids on the first page of the archive, and go back to normal posts on page 2 and later. If so, switch the final line:

// Merge the standard query for this page, and our preferred loop arguments
genesis_grid_loop( array_merge( $query_args, $grid_args ) );

for:

// Only use the grid on the first page
if ( 0 == $paged) {
	// Merge the standard query for this page, and our preferred loop arguments
	genesis_grid_loop( array_merge( $query_args, $grid_args ) );
} else {
	query_posts( array_merge( $query_args, $grid_args ) );
	genesis_standard_loop();
}

Styling The Grid Loop

In terms of styling, the simple example focused on the case when you have two columns – float one left, float one right, give them both a width of just under half, with some padding in between. However, if we want more than two columns in our grid, we can’t make use of the even and odd class names, so we’ll add our own, using the function we defined earlier on.

/**
 * Add some extra body classes to grid posts.
 *
 * Change the $columns value to alter how many columns wide the grid uses.
 *
 * @author Gary Jones
 * @link http://dev.studiopress.com/genesis-grid-loop-advanced.htm
 *
 * @global array $_genesis_loop_args
 * @global integer $loop_counter
 * @param array $classes
 */
function child_grid_loop_post_class( $grid_classes ) {
	global $_genesis_loop_args, $loop_counter;

	// Alter this number to change the number of columns - used to add class names
	$columns = 3;

	// Only want extra classes on grid posts, not feature posts
	if ( $loop_counter >= $_genesis_loop_args['features'] ) {

		// Add genesis-grid-column-? class to know how many columns across we are
		$grid_classes[] = sprintf( 'genesis-grid-column-%s', ( ( $loop_counter - $_genesis_loop_args['features'] ) % $columns ) + 1 );

		// Add size1of? class to make it correct width
		$grid_classes[] = sprintf( 'size1of%s', $columns );
	}
	return $grid_classes;
}

By the time this function is run, we’re inside the grid loop, about to start showing individual posts. Specifically, this is run when it comes to adding classes to each post.

We start by pulling in another couple of global variables – one created by Genesis when it was creating the loop, and another from WordPress that identifies how far through the loop we’ve got; for each post that is displayed, $loop_counter gets increased by one.

The next line is so simple, yet is probably my favourite – once the CSS is set up (we’ll get to that shortly), it’s just this value you need to change to alter between two, three, four or more columns on the grid. Beautiful

We then come to adding our extra classes. As we only want them on our grid posts, we skip over this section if we’re outputting a feature post. For grid posts, there are two classes being added. The first adds a numbered class, indicating which column we’re in; this allows you to style all of the third column posts, say, via .genesis-grid-column-3 { color: red; }. The second class adds a size1of3 class (when $columns = 3), and this is used to specify the width of the column.

Suggested CSS

Taking our lead from some of the Genesis 1.5 style sheet styles, we come up with the following:

#content .genesis-grid {
	float: left;
	margin: 0;
	padding: 15px 0 10px 3%;
}
#content .genesis-grid-column-1 {
	clear:left;
	padding-left: 0;
}
.size1of2 {
    width: 48%;
}
.size1of3 {
    width: 31%;
}
.size1of4 {
    width: 22.5%;
}
.size1of5 {
    width: 17.4%;
}
.size1of6 {
    width: 14%;
}
/* Above widths assume 0 left padding on the first column, 3% left padding on all
subsequent columns, and a total sum of 99% to avoid browser rounding errors */

All of the grid elements are floated left and have some padding added. The grid posts in the first column are set to stop floating, and move on to a fresh new row, with the left padding removed. Finally, all the column widths are added (for up to 6 columns) based on work that Brian has done on the new Genesis style sheet.

If you want different amounts of padding, then you’ll need to adjust the width percentages, else you’ll either have noticeable gaps, or the last post in a row wrapping around to below the others in the same row.

Putting it Altogether

Here’s the final PHP code to drop in to your functions.php file (and don’t forget to put the CSS above into your style.css) – remember to change values on the highlighted lines:

add_action( 'genesis_before_loop', 'child_maybe_do_grid_loop' );
/**
 * Before we get to the loop, see if we're anywhere but a single page. If so,
 * swap out the standard loop for our grid loop.
 *
 * @author Gary Jones
 * @link http://dev.studiopress.com/genesis-grid-loop-advanced.htm
 */
function child_maybe_do_grid_loop() {

	// Amend this conditional to pick where this grid looping occurs
	if ( ! is_single() && ! is_page() ) {

		// Remove the standard loop
		remove_action( 'genesis_loop', 'genesis_do_loop' );

		// Use the prepared grid loop
		add_action( 'genesis_loop', 'child_do_grid_loop' );

		// Add some extra post classes to the grid loop so we can style the columns
		add_filter( 'genesis_grid_loop_post_class', 'child_grid_loop_post_class' );
	}
}

/**
 * Prepare the grid loop.
 *
 * Takes care of existing query arguments for the page e.g. if it's a category
 * archive page, then the "cat" argument is carried into the grid loop, unless
 * it's overwritten in the $grid_args.
 *
 * @author Gary Jones
 * @link http://dev.studiopress.com/genesis-grid-loop-advanced.htm
 * @uses genesis_grid_loop() Requires Genesis 1.5
 */
function child_do_grid_loop() {

	global $query_string, $paged;

	// Ensure the arguments for the normal query for the page are carried forwards
	parse_str( $query_string, $query_args );

	// Create an array of arguments for the loop - can be grid-specific, or
	// normal query_posts() arguments to alter the loop
	$grid_args = array(
		'features' => 1,
		'feature_image_size' => 0,
		'feature_image_class' => 'alignleft post-image',
		'feature_content_limit' => 0,
		'grid_image_size' => 'grid-thumbnail',
		'grid_image_class' => 'alignleft post-image',
		'grid_content_limit' => 0,
		'more' => __( 'Continue reading →', 'genesis' ),
		'posts_per_page' => 6
	);

	// Make sure the first page has a balanced grid
	if ( 0 == $paged )
		// If first page, add number of features to grid posts, so balance is maintained
		$grid_args['posts_per_page'] += $grid_args['features'];
	else
		// Keep the offset maintained from our page 1 adjustment
		$grid_args['offset'] = ( $paged - 1 ) * $grid_args['posts_per_page'] + $grid_args['features'];

	// Merge the standard query for this page, and our preferred loop arguments
	genesis_grid_loop( array_merge( $query_args, $grid_args ) );

}

/**
 * Add some extra body classes to grid posts.
 *
 * Change the $columns value to alter how many columns wide the grid uses.
 *
 * @author Gary Jones
 * @link http://dev.studiopress.com/genesis-grid-loop-advanced.htm
 *
 * @global array $_genesis_loop_args
 * @global integer $loop_counter
 * @param array $classes
 */
function child_grid_loop_post_class( $grid_classes ) {
	global $_genesis_loop_args, $loop_counter;

	// Alter this number to change the number of columns - used to add class names
	$columns = 3;

	// Only want extra classes on grid posts, not feature posts
	if ( $loop_counter >= $_genesis_loop_args['features'] ) {

		// Add genesis-grid-column-? class to know how many columns across we are
		$grid_classes[] = sprintf( 'genesis-grid-column-%s', ( ( $loop_counter - $_genesis_loop_args['features'] ) % $columns ) + 1 );

		// Add size1of? class to make it correct width
		$grid_classes[] = sprintf( 'size1of%s', $columns );
	}
	return $grid_classes;
}

Summary

Even after all of this, there are still more ways you can go extend grid loops – the code above can be adapted so that you have differently configured grid loops running on different archive pages, or using a grid loop that uses a custom loop to output the posts in some special way (think images + post title caption for a portfolio). Go ahead and experiment!

The Code

<?php
/**
 * @package GCF
 * @author Gary Jones & http://www.calculatorsoup.com/calculators/math/gcf.php
 */

/**
 * GCF is a class for finding the greatest common factor of 2 or more numbers.
 *
 * Requires PHP5.
 */
class GCF {

	/**
	 * Holds all values from which to find the GCF.
	 *
	 * @var array
	 */
	protected $values = array();
	/**
	 * Holds calculated GCF. Initialised to 1.
	 *
	 * @var integer
	 */
	protected $gcf = 1;

	/**
	 * Initialise object - grab values into array, check they are valid, and
	 * if all is well, do the calculation.
	 *
	 * @param integer|array $arg Accepts either an array of integers, or multiple
	 * integer arguments
	 */
	public function __construct( $arg ) {

		// Check for values listed as individual arguments, and grab as array
		if ( func_num_args() > 1 )
			$this->values = func_get_args();
		else
			$this->values = (array) $arg;

		// Check we have at least two values
		if ( count( $this->values ) < 2 ) {
			$this->error_not_enough_values();
		}

		// Loop through each value to check it is valid
		foreach ( $this->values as $value ) {
			if ( ! $this->isValid( $value ) ) {
				$this->error_invalid_value( $value );
			}
		}

		// Ensure we're at the start of the array
		reset($this->values);

		// Do the calculation
		$this->calculate();
	}

	/**
	 * Deal with the case when we only have one value.
	 */
	protected function error_not_enough_values() {
		trigger_error('Not enough values submitted to find the greatest common factor.', E_USER_ERROR);
	}

	/**
	 * Deal with the case when at least one value is invalid.
	 *
	 * @param mixed $value Invalid value that was given
	 */
	protected function error_invalid_value( $value ) {
		trigger_error('The value of ' . $value . ' is invalid for finding the greatest common factor.', E_USER_ERROR);
	}

	/**
	 * Return or echo the calculated GCF value.
	 *
	 * @param boolean $display Whether to echo or return the GCF value. Default is false (return)
	 * @return type
	 */
	public function gcf( $display = false ) {
		if ( $display )
			echo $this->gcf;
		else
			return $this->gcf;
	}

	/**
	 * Check each number submitted is valid - not 0 or negative.
	 */
	protected function isValid( $value ) {
		if ( is_int( $value ) && $value > 0 )
			return true;
		return false;
	}

	/**
	 * Do the calculation of the GCF.
	 */
	protected function calculate() {

		// Count the number of values in the array
		$num_values = count( $this->values );

		// Get the first 2 values in the array
		$x = current( $this->values );
		$y = next( $this->values );

		// set up a for-loop to check through all of the values in the array
		// the first pass will check 2 numbers then each additional pass will check 1
		// make ($num_values - 1) passes
		for ( $i = 1; $i < $num_values; $i++ ) {

			// Set up the larger and smaller of the values
			$a = max( $x, $y );
			$b = min( $x, $y );
			$c = 1;

			// Find the GCF of $a and $b
			// It will be found when $c == 0
			do {
				$c = $a % $b;

				// Capture last value of $b as the potential last GCF result
				$this->gcf = $b;

				// If $c did not = 0 we need to repeat with the values held in $b and $c
				// at this point $b is higher than $c so we set up for the next iteration
				// set $a to the higher number and $b to the lower number
				$a = $b;
				$b = $c;
			} while ( $c != 0 );

			// If $c == 0 then we have found the GCF of 2 numbers
			// now set up to find the GCF of the last GCF we found and the next value in the array()
			$x = $this->gcf;
			$y = next( $this->values );
		}

	}

}

Usage

// Use an array
$gcf = new GCF( array(225, 45, 15, 540) );
echo 'GCF = ' . $gcf->gcf();
// Outputs: GCF = 15

// Use a comma-separated list of numbers
$gcf = new GCF( 225, 45, 15, 540 );
echo 'GCF = ' . $gcf->gcf();
// Outputs: GCF = 15

Extending

As the class has protected properties and methods, this class can be extended if you want to, for instance, amend the error handling for particular objects.

class My_GCF extends GCF {
	protected function error_invalid_value( $value ) {
		die( $value . ' is not valid.' );
	}
}

$gcf = new My_GCF( array(225, 45, 15, -10) );
echo 'GCF = ' . $gcf->gcf();
// Outputs: -10 is not valid.

Open up the functions.php file in your child theme and add the following code. The code should be entered at the end of the file, just before the closing ?> if there is one.

We simply search the home breadcrumb for a href attribute and value, and replace it with our new URL; for this example, it’s http://example.com/home but you’ll want to change it to something else.
At the time of writing, Genesis 1.5 is in beta, and the same modification can be made, but just on a differently named filter, so that’s included as well.