added a couple bits to conditional_tags