added more featuers