Merging in Gene's laser updates.