Getting it working 2

see previous
Reverting my changes because i don't need them