fix missing brackets
reorder
changing order