naja, added two senarios