added more stuff and took some away