refactor for propex v5