Updated for current robot