save before fixing some bugs