Skip to content

Rearranged code

Rearranged code #866