more stuff related to #105