Added lots of features!