Skip to content

simplify and test

simplify and test #188