Updated and merged