Updated the boilerplate