Updated boilerplate with some tweaks