more changes on this