Stupid template changes and use puma