chaned a few things