and more editing