reordered a few lines