Commit 017: Updated build