Made it more efficient I think