Refactured the next steps
Nightly 0.0.1a3