I don't understand this part, but if you think it's ok I can merge it