the modularity is unnecessary and confusing