Peter rules
merge fixed 2