reverting base and adding template base