add new features
add new features 2
fix bags