many updates as recommended by Rachel Haider