migrate to 5.4