Lots of changes
Joraaver forgets to comment out original code