added some more awesomeness