adding master and slave fixing couple of depdencies