Skip to content

re-arrange logic

re-arrange logic #26