Updated to latest boiler plate code.