Adjusted build process slightly
Tweaked the code