Feature/bailey updates