updated goto
merge conflicts
also week3, may need merge