Add pre-dependency to bootstrap
Add experimental nick retake