is ds variable used? if not I would keep the same format as line 134.