for better migration