Added my modifications