Changed structure and added commands to save current WP, restore it, and update