Updating initial boilerplate