Added lazycat's suggestions