[Changed]Further implementation of modes