Updated the definitions a little bit