Add staggering and better rotation maths