Brought in line with our implementation