REFACTOR: swap image laoding