Apply changes according to Sackin & Amira's feedback