merging with alvaro changes