added rodney image
fixed merge conflicts