Updated with slave