little changes to support v5