adding latest boilerplate changes