I think migration works. Need to cleanup