missing locals
changed behaviour of O shortcut