master edit
detail fix
detail fix