more changes as follow up