Added Shake and better drawing effciency, and storage