Continuation of #18
Continuation of #18