make more robust
stopping here