Clean up, LR added