Improved for echodoc