Changes that need to be made in CFB