Fixed Up Ben's changes