with history working version