Added CC Method, Tidied some stuff