Removed old commented stuff.. (didn't work)