need to add loop and modify