Added/renamed identical and improvize