remaining items in first commit