continuation of #34 

continuation of #34