more editing from older system to new