made progress for issue #1