final changes for 5.4