Some slight changes to make things clearer