Updated boilerplate