some more major changes