Little generalization
Updated 5.5 to 5.5.37