initial changes after testing