alot of features added