added a couple more bits to conditional_tags