Working on improvements suggested by doubleyou