updated with enduser and module finder func