Final Version - Just a couple little things