Tick marks functional, few changes