Merged in Brian's changes from the profile pic branch