after the last hope
merging stuff