some changes
merged
preparing to merge
merged and added seeds for presentation