changed ##1## to #TODO: strings