Moved stuff to right positions.