trying to fix module logic