Updating assignment 10. OMG it works for now...