changes to model and location tracker