Updates

[unfinished; not worked yet]