Added two thirds of the definitions