edit two (finally, the correct one)