changed some templates around