added slave and master