new stuff by corné
merge resolved