made updates based on your comments