Update according to boilerplate