Adding changes made last week, can't remember what I did
working with the modal