Updated module based on feedback