Some more editing