ADD ability to save stared space