changed some mv to cp & rm command