Redid all my work. Hope this works