update versions and change to flatly