updated last changes from lux