Small modifications to Leonardo