Working on improving the sub modules