changed mode behaviour