Addressing FC007 and FC045