Updated code base

Updated code base per Rob’s request.