pushing remaining changes for fix