Modify template to make it work in its simplicity