LR-187 more improvements