Fixed double buffering
Updated