Mike_ some changes