Further changes to make it more Jaguar friendly