Added some improvements from newer robots