adding in more c2k changes