added majority of features