A bunch of changes
Presetnatin worked