Almost 1.6.2 worthy