now properly migrating to current state, thanks daniel ferreira