Partial implementation #42