change save method
alhamdulillah, many bug fix and add validation