Beolvas stuff.
Merge branch 'zed'