Changes suggested by @michaelficarra