latest changes

latest changes ready for build