@philips Do you think it is better to separate the logic?