moineau: some random changes