addded and edited