Discussions finalised and some into to tech solution
merge