Fixing up
Adding more modes