changes to increase module functionality