Changed types, switched to literal chars vs. tokens