Demoed version of M6
merge attempt1