Included changes suggested on Reddit