Added if/else blocks, added sensor block to rover, updated xml for scenario 3