Updated with latest code change details.