revised after PivotalTracker response