Moved commands directly into local