GOP convention plan continues to evolve