More work with LL-497. still problems.