remove reurn in save function