some major changes in all parts