Skip to content

Improved logic

Improved logic #141