better naming by @michaelficarra