resolve errors + history works