Re-did Amin's changes that I deleted by mistake while trying to fix conflicts