Something like what I had originally