Updated definitions... again