get pr more in line with current code