Slight optimization to states