FourVector class rewritten