Some changes and rearrangement