update on #115 and #105