ok issue #1, ok issue #2