Fix logic more
Add cargo