added and edited in branch