Module option logic changed!!!