versioned
Fixed some memory and cpu usage issues