modified according to email