Some improvement when agent in home / store (still buggy)