Added my name in relevant places