Adding more modes