Revert "Revert to old version of working SLAVE"

This reverts commit 926fd8828e764e38d2a5055cd4baf26c2340fa00.