fixed all this stuff up
Fixed