some initial modifications for #119