Modified templates a lil'