changed more stuff