reverting more mistakes