save bug fix and delete all implmeneted