Change in logic.... still not complete