updated, removed commented out code