Continuation of #85
Continuation of #85