added unifier and more logging