migrating into template style
about to merge