Trying to bring things back to where they were!
Reversed a few things that should have stayed but were taken out.