updated some definitions.