minor changes in the code ordering