merging lalo's stuff