merge new code from LX