revert, fix in propper way, fix template