It works (updates #56)