Files from my modifications to 2.x design