I think I understand better what you want. Please take a look at the latest push.