latest changes

latest changes based on comments