Merge with ver. 5