Still refactoring Slave