#47 Updated Amir's name