Skip to content

Improve logic

Improve logic #25