Complied with Lucas changes