finished nic's feedback and also elena's.