change names, add logging