FIX Concerns in the PR