Skip to content

Refactor and test

Refactor and test #718