all remaining changes