merge packages from Mohan and Lucas