Implemented some more changes