Added my latest changes