shorten ds names and use logging