Comment and update for performance