Part 2: Do not need export anymore