some quick changes
took away an extra one