better handling of relativity