fixes upating scenarios and prepares for performance measurements