cc6 up to date implemented everything but still need to test