updating awesomeness
merging awesomeness