fixed EVERYTHINGGGGGGGG