Benny's patch

ready for pull