improvements before name change