changed structure to fix