Making it more awesomer