continued state of the art
merge