vector included, some changes