Issue/149 

Partial improvement. Batching to follow.