new style for 2.7
update to new upstream version for C6