Better main
Merged