Continuing changes for FastCo version.