[ADD] Locking revised; now based on visitor