Updated PR as per changes requested.