Updated with Project 8 Code