Removed bullshit, added position
Accounted for both modification