Removed raw pointer passing; still jittering