Updated to include new commands!