Add caffeine and remove spark