Update versions and change to flatly