updated templates and removed unnecessary assignments
backing up, maybe ruined everythign?