added and edited