lots of changes with help from office hours