updated to new definitions