Refactor. Temp backup.