some changes.. working