changed to falangafone added conditional remove ds