DIGIDON :This part should be improved later on...