let's try to merge both