Changes according to email discussion