changed alot part 3
-complete overhaul