Fix bin/vigil
Fix bin/vigil
Refactoring
Refactoring