reworked examples and templates