removed commented-out duplicate function