More work on sample template