More YCM stuff