#153 done. #119 updated