Modified non workinh save function