Pushing some changes back in for LCS