Lots of features added