Constants rearranged