update to support easier migration