TODOs for the next final version:

- image check!