Added more modes