nicer, and starting to add slaveOK flag