template fix
Merge branch 'endpoints'