added some support to the new version