Slightly better but still have issue #1