most of suggested major changes