Added more complex mode stuff