update for new property scheme