straightened everything
merged