Adding LRC and some cleanup