modifications. debugging and testing. modulle fully functional now