update deps and improve logic
1.1.0