Now using the correct modes