updated second part of question