snips added, YCM improved