added two structures