Added code to save names even tho not used yet