Changes for slave