improve more in view and history