cleanup
merging mk2