Updates

- redo implementation after long break