fixed ordering stuff