ported mari0 and added it