*fixed problems with commas