worked on q3c
merge conflicts