commit after completion of task #75 also completed some modification in
the code