Upgraded to latest Morten code and optimized to be immutable.