Fixed ;
Fixed data formatting issues