Updated with new Spike project