2nd Draft w/ corrections - need to check graphics