need comments
merging