Lots of updates for the classic mode