Review2.6.2

Why do we need a custom main?