some new features still dooing hard work