Made caffeine optional