Some improvement, save feature broken!