peter rules again
merge fixed