all changes in 2 weeks
merging