merged slee's lx changes