2.5 compatibility update