Made more awesome