persia data on rotation and some design tweaks