modifications for icra2013 demo