first merge, need to check corruption tests