Updated

Code updated per recommendation