Started on some IR changes