merging latest changes
updating code