Update #17 and prepare #15