final commit from Sparkbox macbook