Updated build to latest changes