- Partial implementation of Issue#1