Add double buffering (sorta)