proper command mapping