first version worked
clean up