updated two, removed commented out code