Ok I think we are back to amadu's latest commit now.