putting custom_tags back in