Making it a litte better