Updated files with added fixes
Updated files with added fixes