Making more robust