Make some changes based on Kieran's input