Post latest changes

Just posting latest changes