Moving to the right module
Adding comments