fixing order for speed