New scenario and bug fixes