Made changes to first question