Updated Contrib from Rob