Upgraded for more awesomeness.