Update with kinks to work out