Made slight efficiency change