Fixes #7
Not used
Fixes #5
Fixes #6