added more features
merge