Removed the code that was commented because it was bad