Refact. Temp backup.