trying to get rid of discus and collect changes