Adding otto and some smarter updating
fix syntax