Command modifications maybe?