Updated with some additional commands; reordered for readability