Modifications as asked.