finished all initial changes