Back to working + using Beacon to get the MAP