将两个句子改为非限制性定语从句Peter danced and sang all evening.People used

将两个句子改为非限制性定语从句
Peter danced and sang all evening.
People used to think Peter was quiet.
Peter,danced and sang all evening,whom people used to think was quiet.我这样改对吗?
还是将danced and sang all evening放在句末?
Peter,whom people used to think was quiet,danced and sang all evening.