mysql added and users consolidated