wip changes for 1.5 support