f943339f31
- No changes made for now, but the code is there if we want to switch - Renamed functions to be more explicit