added email, incremental changes