Changed up the lines
Reverted most stuff