super clean + 2.6 compat