Edits to bring Robokid to r612