Some nice changes with help from Vanessa