Modified Lei a bit more