Changes based on feedback by victor