[Shabib] some rearrangement