some chgned. Domain model redeveloped