made look structure more efficient