starting to work on setting the values well
merged