added stuff to make migration easier