adding some logic :man_with_turban: