update for all versions to work