Changes based on Hristo's feedback