A bit more editing