FIRST EDITED COMMIT from local(nahongnew)