Reorganized module. Have to update auto IAB function