Merge Sama's Changes

Merge Sama's Changes