Updated to handle thousands place