working, just before adding Name