SOME CHANGES AFTER TESTING