latest changes

Please merge this