Done, now I think you can merge it.