Required for:
Note: I accidentally merged the ltm branch. I reverted these changes with the last commit