Story1

Please merge this feature.
Avoid comment's containing words like 'before', 'previous', 'changed'? Of how much use is that for anybody reading your code in 2 months from now?