Updated code + autonomous