removed some code that doesn't work