small changes after testing