Added slight optimization