added two defines