edited out commented code