Added lots of features
Efficiency gains