Revamping simulation commands