added preparation for new mode