Updated build from source