applied dump improvement suggested by dave