do some better symbol handling here