removed incorrect code that was commented out earlier