update to 5.4.0; merge and deprecate to slim things down