changes from Stefan round 2