more scenario work - location support