Added exposure, fixed concurrency issue with page loading