updating to latest changes before major refactoring.