fix-123 and fix-122 Done Commit for testing