#105 updates