Added all my modifications ...