Removed template, added own