Removed some code that didn't work :(