removed unused param; added todo