Added my previous changes