Lang improvements