#21 #22 Removed references to modes