more changes. Still not done yet.