Edited the templating a bit again