updating now to remove as many errors as posible