overhauling how master and slave interact