Modifying templates a bit