Modified (but i'm not sure exactly what you wanted)