Smart Commit Attempt 3 +review CR