Removed STUPID online untested changes