@elupus do you think it's ok this way?