Getting Shawn's code for my branch