tweaked code a bit for more consistent coding with other blocks