latest changes

latest changes grid functional