Updated

Update and removed the template stuff