Made changes requested by Miranda