moved stuff around merged calles