merging with pedro