made awesomeness, refactor database to see the result
merged