amendnments following product owner feedback