Updating 5.4 strict