Slightly more polished clean up of the jaguar