some fixing in Module-2