Doucment history behavior a little better