Move out of main