Updated wallet
Updated main to use new epoch