Changed up how commands are called