Minor changes plus change of import.