Final commit before move to new development environment