Merging Javier work