Second Commit

resolve Some Error