fixed up to get ready and switch too class based commands