changed structure to what Didem wants