removed more linq