Removed the tjwebb hack and added a better, but still not amazing solution