initial changes of functionality