Merge with part03