Updated from windower/lua