first changes as per review with Tony