live updating Q's working
merge conflict resolved