Save functionality working again