new and modified
merged dev