Making changes as suggested by Mike