Updated to people's suggestions