some commas
merged stuff