Updates

Latest changes and updates to With Otto

[]