recalculated some arrangements