Made some things clearer