Final modification, I hope