merging in latest changes