Some better Rotation Fill logic