Added slight optimization.