removed Marius stuff, testing done