re-implemented manual light control (much cleaner)