Locking and other small tweaks
Remove poke method