code colours added
merge conflicts