continued working on contributors and users