Added bunch of awesomeness