more changes and updates