Updating to 5.4 strict