Calebs changes

updated his 611