making more robust