updates #167 #119 #52