add stuff for 5.4..