Add save and other tricks