Option 2 sounds good, making the change