Seemed to have fixed memory issue, passive logic seems stable