fixed ordering and instructions