some new features
merged files