initial changes. not done yet.