updated modules worked on with richard