Develop

Simplified a few steps