merged in lavanys changes