Extend main, now more verbose