Modified for use with CDF