Update to current state of development