Tracking working :) we need some changes in the architecture