Changes for iLQG integration