finished implementing #66