Added more modes and fixed moo