More work on the boilerplate