Merging Arthur Chen suggetion