accomodate more changes