Add major improvements