rebase

testing new include for cam