Slight efficiency improvement