New city plan could bring comprehensive changes