Testing and polishing issue #3