I'll go with your solution