Working on comments #222