made it little simplier