Added normal mode and some args