Oops, I didn't see your edited comment. 

Is what I just proposed what you had before?