fixed scale and order issues