Slight efficiency modfication