a bit more editing