Updated to remove non-issues