modified users module and others