Update after discussion on dev