Another modification, final