more of latest changes