Fixed history, added YCM