Module upgrade - Part 2