Fixed Up Code