Updated to v1.3.1 with more double-buffering