bug fixes
bug fixes
Merge From Sherry