finished 16r

#308