peter rules
merge fixed