sorry. you are very right. Imported and rebased. 
Still wondering if we aren't duplicating code here...