final update for current issue