added commas and stuff