last modifications, now without duplicate on save :)