TODO in motor_apt