Changed few steps in user scenario