Updates

First working version