Updated Version w Working Modify and Update Screen