got rid of underscores in names
manual merge